| commit | 7d0d9bbb4d34436d2d5f7e5a76d541a5a9efdb42 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Thu Apr 24 17:43:08 2014 -0700 |
| committer | Shawn Pearce <sop@google.com> | Thu Apr 24 17:43:08 2014 -0700 |
| tree | db89d3556d3c4c36554734731f3e567741685c88 | |
| parent | 605b615d062f590b93c422c512f19c87ca908cd5 [diff] | |
| parent | a1ffd908d7bce959f1026300e406e7f735117c4f [diff] |
Merge branch 'stable-2.8' into stable-2.9 * stable-2.8: Install open ssl jar into Gerrit site for bouncycastle crypto provider Bump bouncycastle verison to 1.49 Conflicts: gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java ^^^^^ People need to stop backporting shit from master to 2.8. Either ship 2.9, move up to master, or accept what you have in 2.8. Change-Id: I8741200fcf4159cedcd6bcc8867d14c1b8301bfe